configure.in: Let Apple build without libusb.

cet_util: Let it build without expat.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@2343 f51c46e8-681c-474f-0cfe-069cfd0219fb

diff --git a/gpsbabel/cet_util.h b/gpsbabel/cet_util.h
index 998c83ef05db256142f69505aa01cd532d8df8a3..806df203e59e27e1c1833657e21c1e3eba5fae93 100644 (file)
--- a/gpsbabel/cet_util.h
+++ b/gpsbabel/cet_util.h
@@ -25,12 +25,15 @@
 #include <ctype.h>
 #include <stdio.h>
 #include "config.h"
-#include "cet.h"
 
 #if HAVE_LIBEXPAT
 # include <expat.h>
+#else
+typedef char XML_Char;
 #endif
 
+#include "cet.h"
+
 cet_cs_vec_t *cet_find_cs_by_name(const char *name);
 void cet_register(void);
 void cet_deregister(void);

diff --git a/gpsbabel/configure b/gpsbabel/configure
index bf075830c4dd883e7e6ac9845c9f018886a61d5a..7ae1fc89c55d37f99e5268eaa4b8ec5045215b83 100755 (executable)
--- a/gpsbabel/configure
+++ b/gpsbabel/configure
@@ -2910,6 +2910,8 @@ fi
                OSJEEPS=jeeps/gpslibusb.o
                CFLAGS="$OCFLAGS"
        #       LIBS="$LIBS `libusb-config --libs`"
+           else
+               OSJEEPS=jeeps/gpsusbstub.o
            fi
        fi
        ;;

diff --git a/gpsbabel/configure.in b/gpsbabel/configure.in
index 1ead1b09d661d97d822cc59be2672b88b6b11a82..c4c9b5a3756b727c4110c813d2a003faba9f77b8 100644 (file)
--- a/gpsbabel/configure.in
+++ b/gpsbabel/configure.in
@@ -168,6 +168,8 @@ case "$target" in
                OSJEEPS=jeeps/gpslibusb.o
                CFLAGS="$OCFLAGS"
        #       LIBS="$LIBS `libusb-config --libs`"
+           else
+               OSJEEPS=jeeps/gpsusbstub.o
            fi
        fi
        ;;